Bump version number for (hopefully short-lived) beta.

diff --git a/configure b/configure
index 376b4927d2d9e57dd3679b3464ed945a984358c4..4c865ec37272e7ac090c3218cc7f7343fc55b182 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for GPSBabel 1.5.4.
+# Generated by GNU Autoconf 2.69 for GPSBabel 1.6.0.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -577,8 +577,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='GPSBabel'
 PACKAGE_TARNAME='gpsbabel'
-PACKAGE_VERSION='1.5.4'
-PACKAGE_STRING='GPSBabel 1.5.4'
+PACKAGE_VERSION='1.6.0'
+PACKAGE_STRING='GPSBabel 1.6.0'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -701,7 +701,6 @@ infodir
 docdir
 oldincludedir
 includedir
-runstatedir
 localstatedir
 sharedstatedir
 sysconfdir
@@ -782,7 +781,6 @@ datadir='${datarootdir}'
 sysconfdir='${prefix}/etc'
 sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
-runstatedir='${localstatedir}/run'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
 docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -1035,15 +1033,6 @@ do
   | -silent | --silent | --silen | --sile | --sil)
     silent=yes ;;
 
-  -runstatedir | --runstatedir | --runstatedi | --runstated \
-  | --runstate | --runstat | --runsta | --runst | --runs \
-  | --run | --ru | --r)
-    ac_prev=runstatedir ;;
-  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
-  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
-  | --run=* | --ru=* | --r=*)
-    runstatedir=$ac_optarg ;;
-
   -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
     ac_prev=sbindir ;;
   -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1181,7 +1170,7 @@ fi
 for ac_var in  exec_prefix prefix bindir sbindir libexecdir datarootdir \
                datadir sysconfdir sharedstatedir localstatedir includedir \
                oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-               libdir localedir mandir runstatedir
+               libdir localedir mandir
 do
   eval ac_val=\$$ac_var
   # Remove trailing slashes.
@@ -1294,7 +1283,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures GPSBabel 1.5.4 to adapt to many kinds of systems.
+\`configure' configures GPSBabel 1.6.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1334,7 +1323,6 @@ Fine tuning of the installation directories:
   --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
   --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
   --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
-  --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
   --libdir=DIR            object code libraries [EPREFIX/lib]
   --includedir=DIR        C header files [PREFIX/include]
   --oldincludedir=DIR     C header files for non-gcc [/usr/include]
@@ -1361,7 +1349,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of GPSBabel 1.5.4:";;
+     short | recursive ) echo "Configuration of GPSBabel 1.6.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1461,7 +1449,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-GPSBabel configure 1.5.4
+GPSBabel configure 1.6.0
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1864,7 +1852,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by GPSBabel $as_me 1.5.4, which was
+It was created by GPSBabel $as_me 1.6.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2212,7 +2200,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-DOCVERSION=1.5.4
+DOCVERSION=1.6.0
 
 # YYYYMMDD, please, if beta, i.e. "-beta20060413"
 #DOCVERSION=development
@@ -2220,8 +2208,8 @@ DOCVERSION=1.5.4
 
 # Increase GBBUILD for a new release (why? Where is this ever used?)
 # A: it's used by win32/gpsbabel.rc.in which is used by the setup program,
-GBBUILD=28
-# PACKAGE_RELEASE="-beta20140216"
+GBBUILD=29
+PACKAGE_RELEASE="-beta20200413"
 
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_RELEASE "$PACKAGE_RELEASE"
@@ -7289,7 +7277,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by GPSBabel $as_me 1.5.4, which was
+This file was extended by GPSBabel $as_me 1.6.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -7351,7 +7339,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-GPSBabel config.status 1.5.4
+GPSBabel config.status 1.6.0
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

diff --git a/configure.ac b/configure.ac
index 5130eac3c9309e508fd92d5d67fe919e87c21d1e..02f3526a0e37628ae72a1424b0f1902fb0c79161 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -4,8 +4,8 @@
 AC_PREREQ([2.59])
 
 #PACKAGE_RELEASE=
-AC_INIT([GPSBabel], [1.5.4])
-DOCVERSION=1.5.4
+AC_INIT([GPSBabel], [1.6.0])
+DOCVERSION=1.6.0
 
 # YYYYMMDD, please, if beta, i.e. "-beta20060413"
 #DOCVERSION=development
@@ -13,8 +13,8 @@ DOCVERSION=1.5.4
 
 # Increase GBBUILD for a new release (why? Where is this ever used?)
 # A: it's used by win32/gpsbabel.rc.in which is used by the setup program,
-GBBUILD=28
-# PACKAGE_RELEASE="-beta20140216"
+GBBUILD=29
+PACKAGE_RELEASE="-beta20190413"
 AC_DEFINE_UNQUOTED(PACKAGE_RELEASE, "$PACKAGE_RELEASE", [Define to the release name of this package.])
 AC_SUBST(PACKAGE_RELEASE)
 

diff --git a/gbversion.h b/gbversion.h
index 4686090c06e7262f857ea186fc5408258ca02166..df6233abdd98a17a0e1ce81568d492462b23023b 100644 (file)
--- a/gbversion.h
+++ b/gbversion.h
@@ -4,5 +4,5 @@
  *
  * Isn't simplification via automation grand?
  */
-#define VERSION "1.5.4"
-#define WEB_DOC_DIR "http://www.gpsbabel.org/htmldoc-1.5.4"
+#define VERSION "1.6.0-beta20200413"
+#define WEB_DOC_DIR "http://www.gpsbabel.org/htmldoc-1.6.0"

diff --git a/win32/gpsbabel.rc.in b/win32/gpsbabel.rc.in
index f50ac50a7d15d97ebe67c29b8f5fe3a3c9b82291..0c0e034e2ec92f637fafa30e4c8d08935e0d528c 100644 (file)
--- a/win32/gpsbabel.rc.in
+++ b/win32/gpsbabel.rc.in
@@ -16,7 +16,7 @@ FILEFLAGSMASK 0x3fL
                VALUE "FileDescription", "GPS format converter\0"
                VALUE "FileVersion", "@GBMAJOR@.@GBMINOR@.@GBMICRO@@PACKAGE_RELEASE@\0"
                VALUE "InternalName", "\0"
-               VALUE "LegalCopyright", "(C) 2002-2014 Robert Lipe and GPSBabel contributors\0"
+               VALUE "LegalCopyright", "(C) 2002-2020 Robert Lipe and GPSBabel contributors\0"
                VALUE "LegalTrademarks", "\0"
                VALUE "OriginalFilename", "gpsbabel.exe\0"
                VALUE "ProductName", "GPSBabel\0"